Skip to content

Update Cargo submodule#48549

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo
Mar 11, 2018
Merged

Update Cargo submodule#48549
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo

Conversation

@alexcrichton

@alexcrichton alexcrichton commented Feb 26, 2018

Copy link
Copy Markdown
Member

Hopefully a routine update...

@rust-highfive

rust-highfive commented Feb 26, 2018

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@emilyalbini emilyalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2018
Mark-Simulacrum
Mark-Simulacrum approved these changes Feb 26, 2018
View reviewed changes

@Mark-Simulacrum Mark-Simulacrum left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me if you have a solution for the problem I've noted

Comment thread src/Cargo.lock Outdated

@Mark-Simulacrum Mark-Simulacrum Feb 26, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This'll break some of our tests IIRC so we'll need to not do this until we can get rid of one of the rands or remove extern crate rand from the tests.

@alexcrichton

alexcrichton commented Feb 26, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Feb 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 3075dad has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 26, 2018
@alexcrichton

alexcrichton commented Feb 26, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Feb 26, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 45045d0 has been approved by Mark-Simulacrum

@nikomatsakis

nikomatsakis commented Feb 27, 2018

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

@bors

bors commented Mar 1, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #48349) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2018
@alexcrichton

alexcrichton commented Mar 1, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 1, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 842ced5 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 1, 2018
@Manishearth

Manishearth commented Mar 2, 2018

Copy link
Copy Markdown
Member

@bors p=2

prioritizing risky-to-rollup PRs so they get tested first

@bors

bors commented Mar 2, 2018

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2018
@alexcrichton

alexcrichton commented Mar 2, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 2, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit ac0a2a7 has been approved by Mark-Simulacrum

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 2, 2018
@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 255ecf6 has been approved by Mark-Simulacrum

@alexcrichton

alexcrichton commented Mar 8, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 729905d has been approved by Mark-Simulacrum

@alexcrichton

alexcrichton commented Mar 8, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit c060369 has been approved by Mark-Simulacrum

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c0603695225cb4d9f01eafc06b97728be1389180 with merge b91dd6daa8a1327fc870159c0c1c6aed708aa3f0...

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Mar 8, 2018

Copy link
Copy Markdown
Member
Unused imports. 
[01:16:36] Libstd was built without `wasm_syscall` feature enabled: test output may not be visible.
[01:16:37]    Compiling rand v0.4.2
[01:16:39]    Compiling core v0.0.0 (file:///checkout/src/libcore)
[01:16:41] error: unused imports: `Equal`, `Greater`, `Less`
[01:16:41]   --> libcore/../libcore/tests/slice.rs:12:27
[01:16:41]    |
[01:16:41] 12 | use core::cmp::Ordering::{Equal, Greater, Less};
[01:16:41]    |                           ^^^^^  ^^^^^^^  ^^^^
[01:16:41]    |
[01:16:41] note: lint level defined here
[01:16:41]   --> libcore/../libcore/tests/lib.rs:11:9
[01:16:41]    |
[01:16:41] 11 | #![deny(warnings)]
[01:16:41]    |         ^^^^^^^^
[01:16:41]    = note: #[deny(unused_imports)] implied by #[deny(warnings)]
[01:16:41]
[01:16:41] error: unused import: `core::slice::heapsort`
[01:16:41]   --> libcore/../libcore/tests/slice.rs:13:5
[01:16:41]    |
[01:16:41] 13 | use core::slice::heapsort;
[01:16:41]    |     ^^^^^^^^^^^^^^^^^^^^^
[01:16:41]
[01:16:41] error: unused imports: `Rng`, `XorShiftRng`
[01:16:41]   --> libcore/../libcore/tests/slice.rs:15:12
[01:16:41]    |
[01:16:41] 15 | use rand::{Rng, XorShiftRng};
[01:16:41]    |            ^^^  ^^^^^^^^^^^
[01:16:41]
[01:16:55] error: aborting due to 3 previous errors
[01:16:55]
[01:16:55] error: Could not compile `core`.

@alexcrichton

alexcrichton commented Mar 8, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 0748af2 has been approved by Mark-Simulacrum

@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@alexcrichton

alexcrichton commented Mar 9, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit df84987 has been approved by Mark-Simulacrum

@alexcrichton

alexcrichton commented Mar 9, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 62a8f7d has been approved by Mark-Simulacrum

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 10, 2018
Closed
@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 62a8f7d with merge e1999a6...

@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Mar 11, 2018

Copy link
Copy Markdown
Member

asmjs failed at slice::panic_safe.

Details 
[02:22:46] failures:
[02:22:46] 
[02:22:46] ---- slice::panic_safe stdout ----
[02:22:46] 	thread 'main' panicked at 'explicit panic', libstd/sys/unix/thread.rs:48:5
[02:22:46] 
[02:22:46] 
[02:22:46] failures:
[02:22:46]     slice::panic_safe
[02:22:46] 
[02:22:46] test result: FAILED. 479 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out
[02:22:46] 
[02:22:46] �[m�[m�[31m�[1merror:�[m test failed, to rerun pass '--test collectionstests'

@alexcrichton
Update Cargo submodule
994bfd4 
Required moving all fulldeps tests depending on `rand` to different locations as
now there's multiple `rand` crates that can't be implicitly linked against.
@alexcrichton

alexcrichton commented Mar 11, 2018

Copy link
Copy Markdown
Member Author

@bors: r=Mark-Simulacrum

@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 994bfd4 has been approved by Mark-Simulacrum

@kennytm

kennytm commented Mar 11, 2018

Copy link
Copy Markdown
Member

@bors p=2

@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 994bfd4 with merge 178becd...

@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 178becd to master...

This was referenced Mar 11, 2018
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@alexcrichton @rust-highfive @bors @nikomatsakis @Manishearth @kennytm @Mark-Simulacrum @emilyalbini